Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add a message calling for an end to the Russian invasion of Ukraine #2074

Merged
merged 1 commit into from
Jul 17, 2022
Merged

Add a message calling for an end to the Russian invasion of Ukraine #2074

merged 1 commit into from
Jul 17, 2022

Conversation

luigifab
Copy link
Contributor

@luigifab luigifab commented May 10, 2022 •
edited
Loading

Description

This is a basic text for README and backend.

def

om

image

Related Pull Requests

🇺🇦 #2038

Contribution checklist

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All automated tests passed successfully (all builds are green)
  • Add yourself to contributors list

@github-actions github-actions bot added Component: Adminhtml Relates to Mage_Adminhtml documentation Template : admin Relates to admin template labels May 10, 2022
@luigifab luigifab requested review from Flyingmana, elidrissidev and sreichel and removed request for Flyingmana May 20, 2022 18:34
@elidrissidev elidrissidev merged commit 33dfa26 into OpenMage:1.9.4.x Jul 17, 2022
@github-actions
Copy link
Contributor

Unit Test Results

1 files  ±0  1 suites  ±0   0s ⏱️ ±0s
0 tests ±0  0 ✔️ ±0  0 💤 ±0  0 ❌ ±0 
7 runs  ±0  5 ✔️ ±0  2 💤 ±0  0 ❌ ±0 

Results for commit 33dfa26. ± Comparison against base commit dfb6fe8.

@fballiano
Copy link
Contributor

fballiano commented Jul 17, 2022 •
edited
Loading

To add a line in the README would be one thing, to add a line in our customer's backend, without a dismiss possibility, it's a mistake and a disservice.

fballiano added a commit that referenced this pull request Jul 17, 2022
@fballiano
Revert "Add basic text for Ukraine (#2074)"
8142dd5 
This reverts commit 33dfa26.
@elidrissidev
Copy link
Member

@fballiano I am sorry that you didn't like this change, I merged this PR seeing that it had enough approvals for more than a week.

@fballiano fballiano mentioned this pull request Jul 17, 2022
Merged
@Flyingmana
Copy link
Contributor

I see it differently and think its at maximum a minor disturbance and acceptable to keep it this way till the territory of the Ukraine got restored. Which is why I gave my approval.

@addison74
Copy link
Contributor

Where I work important donations of money for Ukrainians were made. I saw this PR but I did not approve it for one reason, ignoring the message of solidarity that most of us feel we have about the aberrant war of Putler that leads to an even greater destabilization of the world from all points of view economic, sanitary, energetic, it can not be removed. It is basically an imposed message and I think there is an issue here. If we had used the OpenMage feed like we did for "Thank you for using OpenMage!" message, a notification on that line and a message in the Inbox that could be marked as read or removed was perfect. If a user does not agree with the message he will have to change the code.

@imaphpdev
Copy link

Can we just keep this stuff out of the code, please?
What would be next? Support for LGBTQ? Blame Trump and Putin? ...
Imho all the political stuff needs to stay out of a software project.

@fballiano
Copy link
Contributor

Can we just keep this stuff out of the code, please?

Please check #2325

@Flyingmana
Copy link
Contributor

@imaphpdev I make you aware of our Code of Conduct https://github.com/OpenMage/magento-lts/blob/33dfa269fa60d56f4d7af19a393179e3ae927fab/.github/CODE_OF_CONDUCT.md#our-standards

which includes

Showing empathy towards other community members

A notable part of our community is based or related to people in The Ukraine.
And as you name it, also a part of our community is belonging to the group of LGBTQ.

I request you to be more carefully with your words, respecting our Code of Conduct and show empathy towards our community members

@OpenMage OpenMage locked as resolved and limited conversation to collaborators Jul 20, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@elidrissidev elidrissidev elidrissidev approved these changes

@sreichel sreichel sreichel approved these changes

@Flyingmana Flyingmana Flyingmana approved these changes

Assignees
No one assigned
Labels
Component: Adminhtml Relates to Mage_Adminhtml documentation Template : admin Relates to admin template
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@luigifab @fballiano @elidrissidev @Flyingmana @addison74 @imaphpdev @sreichel